[POWERPC][XEN] Deal with "shadow" -> "paging" fallout.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/xen/arch/powerpc/domain.c b/xen/arch/powerpc/domain.c
index e3a56a84aedd3623ea48870445e3056b4b6c364c..312fffdab253b221983d083a23078244d25bb558 100644 (file)
--- a/xen/arch/powerpc/domain.c
+++ b/xen/arch/powerpc/domain.c
@@ -29,7 +29,7 @@
 #include <xen/domain.h>
 #include <xen/console.h>
 #include <xen/shutdown.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
 #include <xen/mm.h>
 #include <xen/softirq.h>
 #include <asm/htab.h>

diff --git a/xen/arch/powerpc/domain_build.c b/xen/arch/powerpc/domain_build.c
index 94cdb7159adf636464717c83ae47d98ffb09d36a..af25abc27e4759f97667f336016af5c57c795716 100644 (file)
--- a/xen/arch/powerpc/domain_build.c
+++ b/xen/arch/powerpc/domain_build.c
@@ -26,10 +26,9 @@
 #include <xen/init.h>
 #include <xen/ctype.h>
 #include <xen/iocap.h>
-#include <xen/shadow.h>
 #include <xen/domain.h>
 #include <xen/version.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
 #include <asm/processor.h>
 #include <asm/platform.h>
 #include <asm/papr.h>

diff --git a/xen/arch/powerpc/domctl.c b/xen/arch/powerpc/domctl.c
index a6d9f7da50eea761b3f39a8ed3ca2a786724c7a6..5177bf6b0347aa8576ff6de2dac661da804b1434 100644 (file)
--- a/xen/arch/powerpc/domctl.c
+++ b/xen/arch/powerpc/domctl.c
@@ -25,7 +25,7 @@
 #include <xen/sched.h>
 #include <xen/domain.h>
 #include <xen/guest_access.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
 #include <public/xen.h>
 #include <public/domctl.h>
 #include <public/sysctl.h>

diff --git a/xen/arch/powerpc/mm.c b/xen/arch/powerpc/mm.c
index 16b6ab02f541e609647ebda4897530cf30f33338..e6dc47f625f68e4355ac18786b63e76453c6f5a4 100644 (file)
--- a/xen/arch/powerpc/mm.c
+++ b/xen/arch/powerpc/mm.c
@@ -22,7 +22,7 @@
 
 #include <xen/config.h>
 #include <xen/mm.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
 #include <xen/kernel.h>
 #include <xen/sched.h>
 #include <xen/perfc.h>

diff --git a/xen/arch/powerpc/shadow.c b/xen/arch/powerpc/shadow.c
index 64bc1c686c9ba12a38ec266f3e2dcb99f5727f44..5cf7a56582ac1ea351078ee27dafebfdbed25632 100644 (file)
--- a/xen/arch/powerpc/shadow.c
+++ b/xen/arch/powerpc/shadow.c
@@ -20,7 +20,7 @@
 
 #include <xen/config.h>
 #include <xen/types.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
 
 static ulong htab_calc_sdr1(ulong htab_addr, ulong log_htab_size)
 {

diff --git a/xen/arch/powerpc/sysctl.c b/xen/arch/powerpc/sysctl.c
index ae5ce508eda8e5e96784b2eb2046b5cd86db4515..cc1e23181aacb39805ac413ad6b917d0a743d3bf 100644 (file)
--- a/xen/arch/powerpc/sysctl.c
+++ b/xen/arch/powerpc/sysctl.c
@@ -24,7 +24,6 @@
 #include <xen/nodemask.h>
 #include <xen/sched.h>
 #include <xen/guest_access.h>
-#include <xen/shadow.h>
 #include <public/xen.h>
 #include <public/domctl.h>
 #include <public/sysctl.h>

diff --git a/xen/include/asm-powerpc/grant_table.h b/xen/include/asm-powerpc/grant_table.h
index 96527bc5c7834cdefc162bf4f4045947e16e2ce6..16b4eb0b7c0e921a8f74f382a58e2608d1bb3be1 100644 (file)
--- a/xen/include/asm-powerpc/grant_table.h
+++ b/xen/include/asm-powerpc/grant_table.h
@@ -51,6 +51,11 @@ int replace_grant_host_mapping(
 #define gnttab_shared_gmfn(d, t, i)                     \
     (mfn_to_gmfn(d, gnttab_shared_mfn(d, t, i)))
 
+static inline void mark_dirty(struct domain *d, unsigned int mfn)
+{
+    return;
+}
+#define gnttab_mark_dirty(d, f) mark_dirty((d), (f))
 #define gnttab_log_dirty(d, f) mark_dirty((d), (f))
 
 static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr)

diff --git a/xen/include/asm-powerpc/mm.h b/xen/include/asm-powerpc/mm.h
index 8a50609d346f527b0074663dee5c4b26e3690a05..205efe37f2c4e0495f3e5488d1d862dd44b33473 100644 (file)
--- a/xen/include/asm-powerpc/mm.h
+++ b/xen/include/asm-powerpc/mm.h
@@ -275,4 +275,12 @@ extern int steal_page(struct domain *d, struct page_info *page,
 
 #define domain_get_maximum_gpfn(d) (-ENOSYS)
 
+extern int guest_physmap_max_mem_pages(struct domain *d, unsigned long new_max);
+
+extern void guest_physmap_add_page(
+    struct domain *d, unsigned long gpfn, unsigned long mfn);
+
+extern void guest_physmap_remove_page(
+    struct domain *d, unsigned long gpfn, unsigned long mfn);
+
 #endif

diff --git a/xen/include/asm-powerpc/shadow.h b/xen/include/asm-powerpc/shadow.h
index 479133b4b86783a172dbc4f673e934d5af21bfbb..28b141585ebf3c4a58a310291e1cca1542ced00b 100644 (file)
--- a/xen/include/asm-powerpc/shadow.h
+++ b/xen/include/asm-powerpc/shadow.h
@@ -32,23 +32,9 @@
       ? machine_to_phys_mapping[(mfn)]                 \
       : (mfn) )
 
-extern int guest_physmap_max_mem_pages(struct domain *d, unsigned long new_max);
-
-extern void guest_physmap_add_page(
-    struct domain *d, unsigned long gpfn, unsigned long mfn);
-
-extern void guest_physmap_remove_page(
-    struct domain *d, unsigned long gpfn, unsigned long mfn);
-
 extern void shadow_drop_references(
     struct domain *d, struct page_info *page);
 
-static inline void mark_dirty(struct domain *d, unsigned int mfn)
-{
-    return;
-}
-#define gnttab_mark_dirty(d, f) mark_dirty((d), (f))
-
 extern int shadow_domctl(struct domain *d, 
                    xen_domctl_shadow_op_t *sc,
                    XEN_GUEST_HANDLE(xen_domctl_t) u_domctl);